More cleanup on legacy code; first tests on sample data