#288 Remove the old toolbar system