Code cleanup and removing requestids