More removing of unnecessary types