Removed unused files and using statements