Change to clear entity