Cleanup legacy loader