SConstruct cleanup