Cleanup: Import just what we need