Added proper deleting