Remove commented code
Remove unused class import