Remove unneeded lexicals