removing more imports. Dunno how this load order will go now
Ongoing puppet compatibility upgrades