Clean up some unused vars