Remove now unnecessary includes