Added proper Logout() method for MSA

Also added TODO to remember to move this to a better home later on.