Removed unsed templates and context menu stuff and fixed cukes.