Remove UI and tests