Clean up and fix of birthdeath