Dinky cleanup