bloc demo markup cleanup