Removing unnecessary Selects