iPod Touch September Upgrade

I just downloaded (and paid for) the September upgrade. I now have more buttons of things I am not going to use because I have a BlackBerry (Mail, Contacts, Maps). I cannot use those things while on the road. I cannot use those things while at work-because Apple does not support a Key Index security connection over WiFi, so it was basically a waste of $9.95. AND now the calculator feature (which I DO use while traveling for the checkbook deductions) has square buttons instead of round so now I am pissed at myself for being sucked into this upgrade.