Cleanup & Breakup the Payload class from 2.x