sconstruct cleanup