use macro for context payload drop, so we can omit this code on relea…

use macro for context payload drop, so we can omit this code on relea… #45