Location2

Removed commented code
Revert "Location2"

This reverts commit 9b91258cd1b12c838fd170763bf80bfa2c1dd938.
Location2

Removed commented code