Two missed files from earlier clean-up