removed XXX comments