Commented out unused vars