Cleanup of requiredParts() per Hoa's suggestions