Cleaned up trace statements