Removed some more elements that aren't required for the first release.