Removed redundant headers