More cruft to delete..