Clean up some ANY usages