Improve performance of ServicesController#index
Remove commented out code
Improve performance of certificate index