Cleaning up commentary and sysouts