clean up sakura gen code