Extract part of GUI logic from OB
Import autocleanup