Removed commetns from client