Removed NMD framework dependency