Start cleaning up SYB opt