Mostly removed parts that were planned, but are not true in the current version.