Remove old markup stuff

(replaced by templates+views)