Remove unused vars