more cleanup
remove Gen-tags