nearby bug fix

1. remove current user from nearby list
2. code clean up