bump to play 2.2.0-rc1 and cleanup