Remove trailing whitespace
Remove protocol dependency from client