Refactoring, removed old visibility methods