remove methods from proto and refactor to helpers file