remvoe unused N
use new configure macro names
use new names