Cleranup
Fixed payload check