Cuck cleanup(31)

Related