Merge pull request #432 from mhaskel/source_cleanup