started cleanup for BEAM 5 release