Clean-up and changes for sign-up revamp...