- further improvement for the type removal