removed now-obsolete code preventing trees + convolution from being simultaneously enabled