Remove unnecissary markup, get the proper markup