removed unneeded versions of castle etc