Name resolution cleanup