Fixing location client

Removing unused method, fixing message handler condition.