Move some things to ncommon, cleanup