First delete file
Merge branch 'clean_up'