#23 Form cleanup after core bootstrap upgrade

Fixes #23