Switches to requests, cleans up dead code