Get rid of all references to height-markers