Removed code factored into Billable Objects module