Final cleanup
Merge commit '9dfe38c510565f0eb1b7b74fdf057d06177799e0'