More cleanup + fix for fixed CBs in RK4