Removed unused parts