Removed unused namespace imports
Removed unused variables