removed addressed XXX comments