Remove redundant property
Remove unused variable