Drop unnecessary variables and comments