Cleanup
Bounce block version, cleanup
Fixing upgrade, cleanup
Fixing block content generation