Removed now unnecessary lines due to changes in main.