Removing some extranneous defines.