Removed conflicting shortcuts. Related to #4