Use override
Remove commented out declarations