Revert "Clean up + bug correction + new UI stub"

This reverts commit 7d0efba47ed3266f1ce4b1b3fecfc447a651cbe4.