Remove some prints, add others