Removed Unnecessary headers