Removed unused files
Some cleanup