diff --git a/src/JuliaFEM.jl b/src/JuliaFEM.jl
index 9d3123a..15695f5 100644
--- a/src/JuliaFEM.jl
+++ b/src/JuliaFEM.jl
@@ -10,129 +10,4 @@ include("elasticity_solver.jl")
 include("xdmf.jl")
 include("abaqus_reader.jl")
 
-export Model, new_model, new_field, get_field, add_nodes, get_nodes, add_elements, get_elements
-
-
-"""
-Basic model
-"""
-type Model
-    model  # For global variables
-    nodes  # For nodes
-    elements  # For elements
-    element_nodes  # For element nodes
-    element_gauss_points  # For element gauss points
-end
-
-
-
-
-"""
-Initialize empty model.
-
-Parameters
-----------
-None
-
-Returns
--------
-New model struct
-"""
-function new_model()
-    return Model(Dict(), Dict(), Dict(), Dict(), Dict())
-end
-
-
-
-
-
-
-"""Get field from model.
-
-Parameters
-----------
-field_type : Dict()
-    Target topology (model.model, model.nodes, model.elements,
-                     model.element_nodes, model.element_gauss
-field_name : str
-    Field name
-
-create_if_doesnt_exist : bool, optional
-    If field doesn't exists, create one and return empty field
-
-Raises
-------
-Error, if field not found and create_if_doesnt_exist == false
-"""
-function get_field(field_type, field_name; create_if_doesnt_exist=false)
-    if !(field_name in keys(field_type))
-        if create_if_doesnt_exist
-            field = new_field(field_type, field_name)
-        else
-            throw("Field not found")
-        end
-    else
-        field = getindex(field_type, field_name)
-    end
-    return field
-end
-
-
-
-"""Add new elements to model.
-Parameters
-----------
-list of dicts, dict = {element_type => elcode, elids => [node ids..]}
-
-Examples
---------
-Create two tet4 element and add them:
-
->>> m = new_model()
->>> const TET4 = 0x6
->>> el1 = Dict("element_type" => TET4, "node_ids" => [1, 2, 3, 4])
->>> el2 = Dict("element_type" => TET4, "node_ids" => [4, 3, 2, 1])
-
-In dict key means element id
-
->>> elements = Dict(1 => el1, 2 => el2)
->>> add_elements(m, elements)
-
-"""
-function add_elements(model, elements)
-    elfield = get_field(model.elements, "connectivity"; create_if_doesnt_exist=true)
-    eltyfield = get_field(model.elements, "element_type"; create_if_doesnt_exist=true)
-    for (elid, element) in elements
-        #prin*tln("Adding element ", elid)
-        elfield[elid] = element["node_ids"]
-        eltyfield[elid] = element["element_type"]
-    end
-end
-
-
-
-
-"""Get subset of elements from model.
-Parameters
-----------
-element_ids : list of ints
-    Element id numbers
-
-Returns
--------
-Dict
-{element_type = XXX, node_ids = [a, b, c, d, e, ..., n]}
-""" 
-function get_elements(model, element_ids)
-    eltyfield = get_field(model.elements, "element_type")
-    elfield = get_field(model.elements, "connectivity")
-    ret = Dict()
-    for i in element_ids
-        ret[i] = Dict("element_type" => eltyfield[i], "node_ids" => elfield[i])
-    end
-    return ret
-end
-
-
-
 end # module