Remove redundancy from old code.
Remove redundancy from old code.

vaaralav/servicemap,City-of-Helsinki/servicemap,City-of-Helsinki/servicemap,Zeukkari/servicemap,vaaralav/servicemap,City-of-Helsinki/servicemap,vaaralav/servicemap,Zeukkari/servicemap