cleaning out unused vars