Cuck cleanup(33)

Related