Renamed Notify to notify in private/definitions.h
Removed unneeded definitions.

These were needed for old design but we require them no longer.