Consolidate bottle defaults and remove a method