howto: cleanup for merge