Now fixing logout, removing secondary keys