Remove commented sections
Remove unused functions