Generated code clean up