Cleaning code in authentifier and module manager