Removed system outs (and other things?)