Type cleanup