Removing more debug statements