Merge "Cleanup pass on the mesh api change. Removed all the simple mesh related calls and temporary objects."