clean up, use sqlite