2.1.1 RC2 - cleanup