Remove unneded markup