Remove redundant inner classes