remove special case for shortcuts