Update figure.py and relates

Bug fix
Remove unrelated modifications

Cancel modification in utility.py

Cancel mod