remove commented out pre-order stuff