[i3] Clean up