some simplifications

(checkpoint at end of day)
handing over to Rasmus ...