Fix Location Bug
Remove Log