Get rid of RemoteAPI in favour of single API model