Minor changes to bottle controller.  Removing debug messages.