Removed un-necessary headers