BaseIO: Cleanup