Cleaning up things which are not relevant in the new model (work in progress, just a backup)