removing unused files and some cleanup