removed structure case classes