More streamlining. Taking out old code/comments.