Remove references to not exist dll
Fix merging with old code