login: general clean up