Develop scons clean up

FW-313. Fix.