Just clean up some log messages and remove unnecessary code