Cleaned up all Services code