Re-compile ch6 and ch7,
remove unused part.