Remove commented code
Remove commented code and fix syntax