#164 again, clean up Any