Major cleanup, removed unused files