Get rid of full-form and small forms
#614 Fix some issues with new versioning system