remove IpoptOptions
rearrange NLP macros