Add debug controller + cleanup