Removing extra imports. On to testing of the http layer next