Cleanup on MAS flag passing