Eliminated unused headers that got there due to copy-pasting