fixed payload expectation
cleanup