fixed merge
removed old files