Added segments to standby cleanup