Hopefully finished clean1-cms.
Debugging in clean1, maybe this time