cleaned up a few traces