rejigger locking on destroy