cleanup of base templates, and addition of cf-client vm