I would take out SimpleDB too. That is an implementation detail users probably don't need. Also, since AWS barely acknowledges SimpleDB anymore, why advertise our use of it?