wind

[CLEANING CODE] : map.component and map.service usage

squash, and update