second commit, delete some 2.1.1 stuff