argh, removed redundent defines