Cleanup + removed PERFLOCK config