Remove keywords for 6.2-r1 (HPN issues), stablize 6.1