Removed Cauldron support

Eliminated the last workarounds for Cauldron