Remove unnecessary types