Remove Makefile / corrections to SConstruct