fix simple govenor

Change-Id: If0813da3c17c1080e4dc2fb4310985ca6f1ef40d
Remove zvmalloc leftovers

Change-Id: If603e84f2302d9e8aa37ebe6ae30e51754f670d8