Removed unused files and cleanup