[improve] analysis template for both Gen6
cleanup obsolete code