Some comments, deleted old code