SI Builder cleaned up