initial commit/merge
removed files