removing System outs
WIP (subject to change)