remove unnecessary inner class