Deletion fixes and Improvements