Removing features that are not used in the branch openatrium.
Changes for openatrium.