Remove hacks - NS API is now fixed