Remove unused classes
Fix some file handler bugs