Removed client part from server, added REST