Delayed tweaks cleanup