Removing old SimpleDB code