cleanup module to work better on newer puppet versions