nicki: clean-up stuff

Change-Id: I2d4f3ebf94c6ccfbe3e055dc60a7a96bd521eacb