Removed earlier code that led toward dynamic queries.