Revert "New setup of objects"

This reverts commit bd032707359dd5c32b6918715ed586544e7ceee0.