Remove location from presenter, not used
Refactor presenter