final 2.1 cleanup