CHANGED:  remove unnecessary code