Updated some comments and removed old code.