Some stuff is obsolete with new nn+ update