Simplify some stuff related to the new OBJ loading