Remove deprecated markup