Ex2.1 cleanup