Cleaned up quick mode notify processing