Instances cleanup

As requested.