undo the persist changes that didn't really help any
clean up some commented out code