Refactoring License & Login

Refactoring and getting rid off unused event calls.