Remove "remove" xs and simplify markup building process