@longwave thanks for removing the deprecated code, it's LGTM.