Clean up Comment entity