i3 cleanup