Cuck cleanup

Cuck cleanup