About to cleanup (VIR/LIB boundary broken?)