remove some cruft includes