Remove dead variable and assignment