Do last pre-PR cleanups