Removed server code, prepare for possibly Firebase