removed numerous traces