Remove dependency to charmhelpers