first commit
adapt other packages
fix classdef
removed commented code
Merge pull request #6372 from beaudett/df-cleanup-2

Df cleanup 2