Preparing for new version by commenting out old code