Remove some unnecessary includes