more tmplate cleanup, b2k++