small changes to comments, removed old methods