[#1376] cleaned up a leak
[#858] Removed a bunch of crufty ifdefs