Getting rid of some old functions not needed.