More type cleaning