Removed shortcuts dependency