Cleaning up startup methods