MultiUser Support cleanup