Removed unused code.
Fixed namespace.
Removed unused code.