Removing unused members
Cleanup includes