I1: removed unneccessary things