Removed no longer used cauldron, reorganized stuff