Removed defines, have not deleted global constant yet