DAT-2197 /wiki/wiki/wiki no more

Plus, some cleanup