Cleaned up drawings, removed unused parts