merge login cleanup