Doc + Removed unnecessary includes