Feature/remove collection form components