Registry parser cleanup