- fixed cleanup of manipulation mixin