Remove extraneous includes