Remove listener which enables clicking map to draw avatar
Refactor structure