Continue cleaning alt_name logic