bump to play 2.1.2 and cleanup