Removed uneeded inner class