Remove commented code from old Class implementatio