Revert "Data management, Encapsulation, unimplemented methods"

This reverts commit 66d1f6b977b111f932fdb8a446d16b5ea28c3211.