cleanup of the drinkpi code