SGF-347 - After release cleanups.