mtwist cleanups