Shortcuts - debugging removal