Removed optionals in delete methods