Debug commands + clean up