Clean up
Merge branch 'clean_up'
Merge branch 'master' into clean_up
Merge branch 'clean_up'