Remove not-needed variable declarations