Merge "remove dependency to unused tile-server"