Cleaning up notify code.