ripping out more markup