updates and some unused shortcut removal