Cleaning up - removing the legacy CHAOS query.