Improve removal of old eggs. Copied from bithucket of asdtech