Remove unnecessary inner class.