Client: Removed unnecesary code.