Remove Class cast