Removed old TC's and fixed stage selection