SI Builder is cleaned up