jpakkane More unnecessary preprocessor symbol garbage gone.