Cleaned up debug traces