Remove useless code after all the previous cleanups