Removed more as builds are still failing.