Removed Timer and Notifier (They weren't even being used)