removed shit / date insertion
removed some legacy
conflict resolved