clean markers buttons
clean unused imports and some unused variable
Merge branch 'clean' into dev