Removing set
Removing unused headers