Removed unneeded headers