clean up shortcut fn