cleanup, track user-made-changes