Removed unnecessary database selectors