Revert "Revert "Fixed Handler""

This reverts commit 883af2c6db305589a2ba27a0ea2ad83f597ba031.
Revert "Revert "Update""

This reverts commit 231309d46e62c87f20cd7fc61c6c25f83bbfa28e.
rm location managr