Coglife: final cleanup before WIP post