Removing certain defs to get build working