unused stuff deleted, context menu added