Not updating services when they have the initial values
cleanup
Merge branch 'release/0.2.1'