CHRONX-27 cleanup