Small cleanups and remove spurious trace