Continue to remove duplicate action/filters and move them to thier own functions.