Fixed code error + removed unused context menu options previously used
for debugging.