Opps, remove unused vars