Remove prints, remove old unused code