Removed build cruft