Df clean code

Leave this code since we want to use it again.