Cleanup + more debug output