SGF-293 - After release cleanups.