Cleanup + FFT now done right