Dispose disposes stuff

Also removed some un-used services