Removed old stuff from master.