Removed deprecated todo
Fixed NDEBUG in assert