diff --git a/Core/Code/Common/mitkException.h b/Core/Code/Common/mitkException.h
index dfcabfab8a..ce1d9ffbeb 100644
--- a/Core/Code/Common/mitkException.h
+++ b/Core/Code/Common/mitkException.h
@@ -1,116 +1,116 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef MITKEXCEPTION_H_INCLUDED
 #define MITKEXCEPTION_H_INCLUDED
 
 #include <MitkCoreExports.h>
 #include <itkMacro.h>
 #include <vector>
 
 namespace mitk {
   /**Documentation
   * \brief   An object of this class represents an exception of MITK.
   *          Please don't instantiate exceptions manually, but use the
   *          exception macros (file mitkExceptionMacro.h) instead.
   *          Simple use in your code is:
   *
   *                  mitkThrow() << "optional exception message";
   *
   *          You can also define specialized exceptions which must inherit
   *          from this class. Please always use the mitkExceptionClassMacro
   *          when implementing specialized exceptions. A simple implementation
   *          can look like:
   *
   *          class MyException : public mitk::Exception
   *             {
   *             public:
   *             mitkExceptionClassMacro(MyException,mitk::Exception);
   *             };
   *
   *          You can then throw your specialized exceptions by using the macro
   *
   *                 mitkThrowException(MyException) << "optional exception message";
   */
   class MITK_CORE_EXPORT Exception : public itk::ExceptionObject
   {
 
   public:
     Exception(const char *file, unsigned int lineNumber=0,
                   const char *desc="None", const char *loc="Unknown") :
     itk::ExceptionObject(file,lineNumber,desc,loc){}
 
     virtual ~Exception() throw() {}
 
     itkTypeMacro(ClassName, SuperClassName);
 
     /** \brief Adds rethrow data to this exception. */
     void AddRethrowData(const char *file, unsigned int lineNumber, const char *message);
 
     /** \return Returns how often the exception was rethrown. */
     int GetNumberOfRethrows();
 
     /** @return Returns the rethrow data of the specified rethrow number. Returns empty data, if the rethrowNumber doesn't exist.
       * @param rethrowNumber The internal number of the rethrow.
       * @param file (returnvalue) This varaiable will be filled with the file of the specified rethrow.
       * @param file (returnvalue) This varaiable will be filled with the line of the specified rethrow.
       * @param file (returnvalue) This varaiable will be filled with the message of the specified rethrow.
       */
     void GetRethrowData(int rethrowNumber, std::string &file, int &line, std::string &message);
 
     /** \brief Definition of the bit shift operator for this class.*/
     template <class T> inline Exception& operator<<(const T& data)
     {
       std::stringstream ss;
       ss << this->GetDescription() << data;
       this->SetDescription(ss.str());
       return *this;
     }
 
     /** \brief Definition of the bit shift operator for this class (for non const data).*/
     template <class T> inline Exception& operator<<(T& data)
     {
       std::stringstream ss;
       ss << this->GetDescription() << data;
       this->SetDescription(ss.str());
       return *this;
     }
 
     /** \brief Definition of the bit shift operator for this class (for functions).*/
     inline Exception& operator<<(std::ostream& (*func)(std::ostream&))
     {
       std::stringstream ss;
       ss << this->GetDescription() << func;
       this->SetDescription(ss.str());
       return *this;
     }
   protected:
 
   struct ReThrowData
     {
     std::string RethrowClassname;
     unsigned int RethrowLine;
     std::string RethrowMessage;
     };
 
    std::vector<ReThrowData> m_RethrowData;
 
   };
-} // namespace mitk
 
 MITK_CORE_EXPORT std::ostream& operator<<(std::ostream& os, const mitk::Exception& e);
+} // namespace mitk
 
 #endif
diff --git a/Core/Code/Internal/mitkRawImageFileReader.h b/Core/Code/Internal/mitkRawImageFileReader.h
index 01e0780430..f71b57953e 100644
--- a/Core/Code/Internal/mitkRawImageFileReader.h
+++ b/Core/Code/Internal/mitkRawImageFileReader.h
@@ -1,74 +1,65 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef MITKRAWIMAGEFILEREADER_H_
 #define MITKRAWIMAGEFILEREADER_H_
 
 #include "mitkAbstractFileReader.h"
 
 namespace mitk
 {
 
 /**
  * The user must set the dimensionality, the dimensions and the pixel type.
  * If they are incorrect, the image will not be opened or the visualization will be incorrect.
  */
 class RawImageFileReader : public AbstractFileReader
 {
 
 public:
 
   /** Supported pixel types. */
   typedef enum {UCHAR,SCHAR,USHORT,SSHORT, UINT, SINT, FLOAT, DOUBLE} IOPixelType;
 
   /** Endianity of bits. */
   typedef enum {LITTLE, BIG} EndianityType;
 
   RawImageFileReader();
 
 protected:
 
   RawImageFileReader(const RawImageFileReader& other);
 
   virtual std::vector<itk::SmartPointer<BaseData> > Read();
 
   using mitk::AbstractFileReader::Read;
 
 private:
 
   template <typename TPixel, unsigned int VImageDimensions>
   mitk::BaseData::Pointer TypedRead(const std::string& path, EndianityType endianity, int* size);
 
   RawImageFileReader* Clone() const;
 
-  /** Pixel type of image to be read. Must be of type IOPixelType. */
-  IOPixelType m_PixelType;
-
-  /** Dimensionality of file to be read. Can be 2 or 3. */
-  int m_Dimensionality;
-
-  /** Endianity. Must be set to LITTLE or BIG. Default is BIG. */
-  EndianityType m_Endianity;
-
   /** Vector containing dimensions of image to be read. */
   itk::Vector<int, 3> m_Dimensions;
 
 };
 
 } // namespace mitk
 
 #endif /* MITKRAWIMAGEFILEREADER_H_ */