Clean up
Restore plock build