Cleanup budgets.models and associated code