cleanup shortcut code