some cleanup for CH-8