Cleanup, still trying to get parse_tree's to work