Cleanup now adds default serialVersionId instead of generated one