Finished merge mannuelly with Ahmed
removed some unused files