Remove unused shortcuts
Cosmetic changes