cleanup and bump to play 2.2.1