Continue tweakins and rewriting for removing Clear functionality.