- cleaned up, remove stuff unrelated to tracing