Cleaned up vestigal.