Clean up of some methods. Actually using services now.