Removed useless private class and operation