Completed removal of shortcuts #18