gras: cleanup factory and init ordering