[Majd/Ravish] Cleanup