Fixed issue with crashing if timer was set on logout
Removal of defunct class
Added extra functionality to Notification
Moved Enum for login