Remove unused elements
Remove unused constructor
Inline variable