Remove 2 file changes that are not related to this feature.
Simplify command code. Fix service configuration.