remove unneeded imports and an inner class