Work in progress: getting rid of editing related dependencies.