Clean up of unafold.py