Remove premature optimization from YAML imports