fix: missing files + cleanup