More refactoring of unlock_runtime.py
Updated config files