Login type cleanup