Remove stupid shortcut stuff