Revert "Add some states for services"

This reverts commit 707a343ec14e57fb6def57fc2c524eb1f1da9872.