cleanups, preparation for console widget