Removed dev code.  Changed form order.  #96