Remove a class
Remove commented out code on first step