started cleanup for Beam 5 release; set version to 2.1-SNAPSHOT