Drop some unused vars

Drop some unused vars