Remove remnant of extension actions
Minor cleanups