Added TODO and added check on delete