Remove dead code and UI