Cleaned up trace garbage