Fixes mocked data api
Cleans up user api and utils