clean up startup/order