#86 clean up mesh in entity