Removed the use of services