Mas cleanups