Tweaks for PodsObject, removing calls to it as it's being implemented in 2.4 instead