Remove unneeded world defs