Remove registry-specific references