Removed code from 2006.