Removing unneded code. Updating some comments.