Cleaned up service service calls

- Cleaned up the service calls so only the ones used for the active page
are called.
- Cleaned up the code a bit to reduce the final built size.
More clean up

Missed a file.