Cleanup code to debug