Cleanup of all features: fix all overrides.
Merge pull request #29 from capacity4dev/feature/CFD-34-Cleanup_overridden_features

Cleanup of all features: fix all overrides.