Minor tidying. Removal of scons legacy.