Minor cleanups, remove printlns and such