some cleanups to multi