Clean up old stuff; refactor to "Code is Data"