removed unused files and functional #357