Even more print() statements removed