Development/leo: Script cleanup