clean-up
de-inherit server from users
renamed User to Client