Remove unused class
Remove commented code