GenCode - Cleanup