Started working on cleaning up requests