Removed printout, also cleaned away some stuff