Merge "Remove the tech debt from the property_service"