2.1 cleanup