Response and Inbox cleanup

Finished cleanup of response and started Inbox Cleanup