Remove some calls to print