Also cleanup in agent code and in config template Change-Id: I5ad6867336421bbb0e2e8d97de865bf42d2ef774