Removing unused services, adding packages