more gabor_wavelet cleanup