Remove redundant API and change class name