Revert "+ remove unused members"

This reverts commit e59d9799691dda8009d980e2dd770fbf9a3cc8f8.
Revert "+"

This reverts commit af8f2e0ee8a7216b6976038d19afc8a91b4593bb.