SGF-303 - After release cleanups.