Updated some comments, removed some old code