Clean up ; use plock