Int 4918/clean up update cf file de duplicate promises remove unused body

See http://www.rudder-project.org/redmine/issues/4918