remove hardcoded id field