Df clean code

Test works in release build.