removed
changed, made changes, refoactored and moved some code to models
fixed merge issues