warbaque refactor effect removal code