[Cyntain] Update

= Generalised clean up