Remove debugging
Remove dead vars as recommended by Scrutinizer CI