Remove unneeded/unused shortcuts

These aren't necessary and the memory search one in fact caused issues.