Remove unnecessary intermediary method