Console cleanups