removed unused OnCommand, fixes #117