additional cleanup adding fwt97_2d_int fwt97_int