Removed all code related to clients