Removing som cruft from the old build system