Switched to using the new run_time entry
Cleanup, removed a lot of cruft
Removed a bunch of unused querying options
Removed a lot of cruft from results