removed unused parts