nicki: cleanup mess