Cleaning up Pre-Order