remove redundant check for PLAY-570