Removed comments, preparing for merge-back.