master: remove a few useless shortcuts