Remove unused preprocessor def
Remove unused version
Clean up defs