Remove select duplication