SGF-306 - After release cleanups.