Tyop cleanups