cleanups, attempt to apply changes to stable systems too.