Quick cleanup on delete features code