removing puts etc