Remove unused code
Remove redundant field initialization