Some clean up after recent changes in master