Clean up unused vars