Remove completely unused variables and private fields