cleaning repo to merge with dev branch