Remove dumb constants to make code cleaner
Remove consts in Client