Get rid of action function