Map fix from Api v2
Removed unused