Removed unused code.
Fixed namespace.