CHANGE : remove comments