Cleanup from DataHandler change.