Some cleanup after changes in ceon-1