Remove Non-Consumable leftovers from core