Removed unused namespaces. Whitespace cleanup.