cleanup code, allow puppet 2.6