fixing
remove gmap
remove unused code
reformulation