Fix symbol generation
Remove crufty old files
Properly cleanup for scons patch