Remove rest of the old functionality.