Remove unneeded code

I'm not 100% sure we can remove those, please double-check.