[WIP] Remove unneeded || @commit.id

I think this is not necessary