Add "common markup language"
Remove obsolete markup