Removed dynamic_casts