Cleanup auto-generated mess