Cleanup Conch defs