Removed unused code and added more services