Some q1 cleanup