WIP to remove model stuff from http module