Removed unnecessary shortcuts.