fixes bad merge
cleanup
Merge pull request #134 from mortardata/oleiman_remove_file_msgs

Oleiman remove file msgs