Removing more unused vars / dead code