Clean up + debugging code