Clean up println statements and redundant code
Signed-off-by:Arie <arieclaassens@gmail.com>