Merge pull request #473 from mhaskel/freq_cleanup