Board Thread:Clean up Concerns/@comment-34097347-20160924191552/@comment-5032898-20170107080829

I agree with the second option as well.