Header Cleanup

Removed unnecessary use statements for class in same namespace.