Cleanup
Sped up testbed by removing custom UI