Entry cleanup