Revert "Preparations objects"

This reverts commit 947867d00a55b464875fa2c868215da857dd4970.