more cleanup, removing prints