Merged logout implementation to new refactored master