Df clean code

Try to uncomment the ASSERT.