Remove more unused vars