Revert "Fixed visibility of methods - partial commit"

This reverts commit 92c6a7085fe53ce35d2e0a551806e4d76f848bae.