Fixes build issues. Some leftover files