cleanup, 1. step (to get some local changes away):