diff --git a/app/client/views/patients/patient.html b/app/client/views/patients/patient.html
index ef34b55..edc4699 100644
--- a/app/client/views/patients/patient.html
+++ b/app/client/views/patients/patient.html
@@ -1,58 +1,41 @@
 <template name="patient">
 <div class="patient">
   <br>
   <div class="row">
     <div class="col-xs-12 col-md-3 col-lg-2 profile"><!-- col-md-push-9 text-right"> -->
       <div class="well">
         <h4 class="id">{{id}}</h4>
         <h4 class="hrid">{{hrid}}</h4>
         <img src="{{identicon _id size=10 scale=15}}">
         <h5>Created at</h5>
         <p>{{fullDateTime createdAt}}</p>
         {{#if study.title}}
         <h5>Study</h5>
         <p>{{study.title}}</p>
         {{/if}}
         {{#if numVisits}}
         <h5>Designs</h5>
         <p>{{designs}}</p>
         <h5>Visits</h5>
         <p>{{numVisits}}</p>
         {{/if}}
         {{#if languages}}
           <h5>Languages</h5>
           <p>{{languages}}</p>
         {{/if}}
         {{#if isExcluded}}
           <h5 class="text-danger">Excluded</h5>
           <p class="text-danger">
             yes <i class="fa fa-lg fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="{{fullDateTime excludedAt}}: {{excludeReason}}"></i>
           </p>
         {{/if}}
-        <h4>Edit</h4>
-        {{#autoForm schema=editPatientSchema doc=formDoc id="editPatientForm" type="normal" autosave=false}}
-          {{#each afFieldNames}}
-            {{> afQuickField name=this.name options=afOptionsFromSchema}}
-          {{/each}}
-          <div class="btn-group">
-            <button type="submit" class="btn btn-primary">
-              <i class="fa fa-check"></i>
-            </button>
-            <button type="reset" class="btn btn-warning">
-              <i class="fa fa-repeat"></i>
-            </button>
-            <button class="btn btn-danger delete">
-              <i class="fa fa-trash"></i>
-            </button>
-          </div>
-        {{/autoForm}}
       </div>
     </div>
     <div class="col-xs-12 col-md-9 col-lg-10"><!-- col-md-pull-3"> -->
       <div id="studyPage">
         {{> Template.dynamic template=template data=templateData}}
       </div>
     </div>
   </div>
 </div>
 </template>
diff --git a/app/client/views/patients/patients.html b/app/client/views/patients/patients.html
index 81770e7..77a20d8 100644
--- a/app/client/views/patients/patients.html
+++ b/app/client/views/patients/patients.html
@@ -1,125 +1,111 @@
 <template name="studyOption">
   <option value={{_id}}>{{title}}</option>
 </template>
 <!--
 <template name="designOption">
   <option value={{_id}}>{{title}} ({{study.title}})</option>
 </template>
 -->
 <template name="patientOption">
   {{#if hrid}}
     <option value={{_id}}>{{hrid}} - {{id}} ({{study.title}} - {{studyDesignTitles}})</option>
   {{else}}
     <option value={{_id}}>{{id}} ({{study.title}} - {{studyDesignTitles}})</option>
   {{/if}}
 </template>
 <template name="visitOption">
   <option value={{_id}}>{{title}} ({{study.title}} - {{design.title}})</option>
 </template>
 <template name="questionnaireOption">
   <option value={{_id}}>{{title}}</option>
 </template>
 
 <template name="visitSelect">
   <select id="visitSelect" class="selectpicker show-tick" title="select visit" data-live-search="true">
     <option class="italic" value="deselect"><b>clear selection</b></option>
     {{#each visits}}
       {{> visitOption}}
     {{/each}}
   </select>
 </template>
 
 <template name="questionnaireSelect">
   <select id="questionnaireSelect" class="selectpicker show-tick" title="select questionnaire" data-live-search="true">
     <option class="italic" value="deselect"><b>clear selection</b></option>
     {{#each questionnaires}}
       {{> questionnaireOption}}
     {{/each}}
   </select>
 </template>
 
 <template name="patients">
 <div class="patients">
   <div class="row">
     <div class="col-xs-12">
 			<select id="studiesSelect" class="selectpicker" title="select studies" multiple data-live-search="true">
         <option class="italic" value="deselect"><b>clear selection</b></option>
 				{{#each studies}}
 					{{> studyOption}}
 				{{/each}}
 			</select>
 
       <!--
       <i class="fa fa-lg fa-chevron-right"></i>
 			<select id="designsSelect" class="selectpicker" title="select designs" multiple data-live-search="true">
         <option class="italic" value="deselect"><b>clear selection</b></option>
 				{{#each designs}}
 					{{> designOption}}
 				{{/each}}
 			</select>
       -->
 
       <i class="fa fa-lg fa-chevron-right"></i>
       <select id="patientSelect" class="selectpicker show-tick" title="select patient" data-live-search="true">
         <option class="italic" value="deselect"><b>clear selection</b></option>
 				{{#each patients}}
 					{{> patientOption}}
 				{{/each}}
 			</select>
 
       {{#if singlePatient}}
         <i class="fa fa-lg fa-chevron-right"></i>
         {{> visitSelect visits=visits}}
       {{/if}}
 
       <!-- hide questionnaires, because we display them fullscreen only for now and
         this list doesn't make much sense like this.
       {{#if singleVisit}}
         <i class="fa fa-lg fa-chevron-right"></i>
         {{> questionnaireSelect questionnaires=questionnaires}}
       {{/if}}
       -->
     </div>
   </div>
-  {{#unless singlePatient}}
-  <div class="row" style="margin-top: 1rem;">
-    <div class="col-xs-12">
-      {{#autoForm schema=addPatientsSchema id="addPatientsForm" type="normal" autosave=false class="form-inline"}}
-        {{#each afFieldNames}}
-          {{> afQuickField name=this.name options=afOptionsFromSchema template="bootstrap-horizontal" class="form-control"}}
-        {{/each}}
-        <button class="btn btn-primary" style="margin-bottom: 10px;">
-          Add Patient <i class="fa fa-user-plus"></i>
-        </button>
-      {{/autoForm}}
-    </div>
-  </div>
-  {{/unless}}
   <div class="row">
     <div class="col-xs-12">
       {{#unless singlePatient}}
         <br>
         <div id="patientsTable">
           {{> reactiveTable collection=patientsTableCursor settings=patientsRTS}}
           <!--
           <table>
             <th>
               <td></td>
             {{#each patients}}
             <tr>
               <td>{{id}}</td>
               <td>{{hrid}}</td>
             </tr>
             {{/each}}
           </table>
           -->
         </div>
       {{else}}
         {{#with selectedPatient}}
           {{> patient}}
         {{/with}}
       {{/unless}}
     </div>
   </div>
 </div>
 </template>