cleanup for barrier_breaker, attitude_adjustment is no longer compatible