Removed debug notify calls