remove unnecessary code from Ivan