Removing trace calls used for debugging