Cleanup and adding Sessions/Requests.