Removed unneeded services