Removed unused files and other fixes