client - redundant code removed