Cleanup and method tracing