removed a few hundred unused vars.