Extensions-all: General clean-up