Merge clean-up into master