Clean up away-notify patch