Remove unused variables and constants