Removed uneeded payload parsing stuff, broke 5.3