FreeTube (standalone client) and LibRedirect (browser extension) nicely replace YouTube.com completely for a much cleaner experience and no shorts.