remove unused vars; increase scrutinizer happiness