SGF-308 - After release cleanups.