getAllData work now (2)

@Nourhan: Please check if the //-code is still needed. Also the change,
whis is mentioned in ab09a51e697a95b8cd963476d4ee090a42cc74d0 could be
helpful?!
Revert "getAllData work now (2)"

This reverts commit 98d7c4853f37ea580fda61d4391bf0ee374f6b9a.