Remove redundant code
Add #select to collection
Remove redundant code