Remove unnecessary import

Signed-off-by: TengChou Yang <threefure@gmail.com>
Move LocationUtil to Constants.

Signed-off-by: TengChou Yang <threefure@gmail.com>
Merge branch 'add.new.map.function'