Update comments, clean out commented out code