remove OSG, MESA, minor change