clean up some apply_to