Clean up type
Strip out even more pieces.