Unused parts removed