removed redundant headers