Added death and cleanup to Entity