fix formatting
remove …, add some comments
use services to cleanup their config files