Removed the json formatting (not applicable to presenter layer), removed some older code no longer necessary.