Bump up submodule and some cleanup