remove hardcoded id removal. Should fix some issues.