major keshif structure cleanup