SGF-283 - After release cleanups.