removed remaining struct typedef