Prior to login cleanup