Cleanup Scallop defs