Remove temporary code and change startup timing