[FIX] passthroughApi bug + cleanup old code