Remove upvoted method and move conditions to association.