Merge branch 'origin/clean_up'