Removed some TODOs.
Fixed two minor TODOs in class ResourceSelector.