cleanup of state changes before/after fading in/out (more generic approach)