commit before removing some features that are no longer needed