SGF-319 - After release cleanups.