I think I got all the old simpleform stuff out FINALLY