redesign mount
removed unused parts