Removed defines