Type cleanup again