Cleanup; can select via right click for now as well.