Removed useless Notifier class and fixed timer and Driver