Removed all the mumble jumble non-arc support.