First pass in cleaning up instance.