Code cleanup. Remove trace statements.