No longer return Response object from raw api and general cleanup.