removed unused func, still needs logging cleanups