Temporary removal of mesh based toolkit functionality