apiGenerator cleanup