Remove UI stubs