Update marker position while dragging
Remove obsolete code
Remove dead code