Remove unused markup, fix keywords