SGF-286 - After release cleanups.