Gentle featurecut

All the experimental features are still in the project, they just are
not seen from user menu.