MSAA cleanups