Removing more printlns