Improve UX, drop dead code