Remove unused code
Hide private methods