Clean up Generated Code