Remove commented code
Remove em assignation