Cleaned bit of things

no more preprocessors  needed to compile my part of the changes