Remove trace
Remove more trace messages