Additional code clean-up of AUTH module