Remove excess funtions around action extraction