Removed stuff.
Rewritting to C++