Remove unused code and redundant variables
Inline variables