update imports and remove un-needed fdw