Clean up of types