Removed unneeded methods from the public interface
Refactoring