Removed shortcut function
Shortcuts added, cleanup done