add missing imports, remove no longer needed ones