Cleaned up code from controller, usage grid calcs all in service now