Remove notify dependancy