Revert "more data / code"

This reverts commit 33716e657a6d64f1ac014e9825549a51810a6a65.
fubar