We should just get rid of this section.