import/include cleanup