removed a few comments, removed an unused definition