Cleanup Duck defs