Remove unneeded variable declarations