Unnecessary markup removed